merged
authorJeremy Fitzhardinge <jeremy@xensource.com>
Thu, 24 May 2007 09:48:58 +0000 (10:48 +0100)
committerJeremy Fitzhardinge <jeremy@xensource.com>
Thu, 24 May 2007 09:48:58 +0000 (10:48 +0100)

Trivial merge